Merge branch 'jvesely/babl-master'
authorØyvind Kolås <pippin@gimp.org>
Thu, 6 Dec 2018 22:18:09 +0000 (23:18 +0100)
committerØyvind Kolås <pippin@gimp.org>
Thu, 6 Dec 2018 22:18:09 +0000 (23:18 +0100)
commit46fb081bb96c7e96700561df9f69c4995259ebf8
tree2ce599a165f681a1bb05b9f41af8ed4f8e651fe4
parente927fc3cdaa0735db0f80b5c7119da93c387e1e9
parent1216691c34ed06ab0f3ece42cc029850147f9792
Merge branch 'jvesely/babl-master'